Removed old code, fixed non-updated class directory