Revert "Added a default profile and cleaned up some code."

This reverts commit 1a77ec7efb6b5b0b75dca9464b67d54c7aa8885c.