Removed unused code (See #4)