Better architecting. Cleared out some trash.