Hack and slash cleanup