updated functionality and removed unused files