Cleaning out cruft and removing empty non-functional functions.