Remove comments, waiting for nayeema and design input