Removed a few unused methods