clean up a bit needless code