Removing some useless stuff