Cleaned code cruft