Removed leftover code