Clean up of all code