Cleaned up and removed even more clutter