Removed useless things and clean up some stuff.