Remove before and after method

Needs to be done in a different way