Removed some implementation-specific code (this shouldn't have been added).