101 cleanup of redundant code, brought scaladoc warnings down to 3