Removed useless code and wrong methods for functional test