Cleaning

Put back drawing functions and removed unused variables