Updated heredocs, removed commented out code