Removed authentication
Added comments for TODO