Removed leftover code again