Cleanup

Just another cleanup