Some cleanup, also made a script for cleaning up my test sub