Getting more done
Removing some useless stuff