Erased a few things from commit to master
Revert 48f947c..2a33b27

This rolls back to commit 48f947c81bfdb3354dbeba5da8a98b589558c948.