post-final :). starting some simple cleanup.