some small removals and refactors