Removed unused methods/added comments