Code refactoring; removal of rake file tasks