Removed unwanted code from master