Removed some unneeded junk. some more progress.