Removed things that aren't in the functionality anymore