Removed some extraneous methods