Removal of old code and prints