Cleanup un-needed things