Removed leftover simple cruft