Further refactor

Deletion of unnecessary methods and comments.