Code cleaning

removed unused and non relevant code and files