Removing non-core code