Removed unused/not working code