Cleaning up stuff
v2.2.2