Added comments removed user check

Removed user check and commented code