Removed unused function
Removed already moved function
Menu under development continues