Deleting unnecessary model + better tagging