Cleaned out garbage, will re-commit everything for cleaner organization