Small changes and deletions

Still needs to be fixed.