Removed unwanted code and references