Cleanup

Remove duplicates and some unneeded stuff for now