Removed some cruft :)