Useless methods removed, more commenting cleanup