Cleanup

Would actually help if I committed the proper changes