Removed some dead code and added a comment