Add comments, remove old battle system