Can you get rid of the cruft and unused functions in here?