Removing more unnecessary/old code.