Futher cleanup