removed even more stuff