More Code Removal