cleans up @jakimfett 's mess :p