Removed some more garbage