Removed a few stuff & final setting