More cleanup this place is a state, messy twat.