Removed some redundant grep & cat commands