cleanup
cleanup
simplifations
refactoring
cleanup
cleanup
cleanup
cleanup
using skipall possibly fixing a bug