Removed some junk