More simplifying. Removing unnecessary stuff.