Removed some extraneous things