Logging done & crap removed