Removed unused methods and added idiot proof checks