Cleaned up main class, removed methods no longer in use