Removing un-needed stuff