Removed test code and comments