Removed unused methods/files