Deleted and merged some things