Removing leftover code