Remove some messy stuff