Trying some clean up...