Started removing excess functionality