Removed even more stuff!