It's a mess
Cleanup. Removing everything not needed at the moment.