Final modifications
Removing excess code