Removal of leftover code