Code cleanup. Removed unnecessary methods.