Removed even more unneeded code