code cleanup

removed commented out code
updated attribute publishing