Remove unnecessary stuff
Make it spatial