Removed unused code and updated description