Removed and moved some things