cleaning up, trimming some stuff thats no longer needed brom the bsterne code base