Clean up code, delete some cruft