Remove tidy stuff for now