Updated to delete comments