Removed unused functions.
Cleaned things up for just a simple use.