* Initial fix, need to remove demo * Fix similar issue with contracts module * Remove Demo Module for Testing * Undo changes to Contracts module