Removed main methods from Udbhavs changes