Removed the usless stuff