Cleaning some basic stuff