Code cleanup - app still in non working state