Removed unneeded #'s