removed localstore and few changes