Removed unwanted functionality for release