removed unused code or code that doesn't belong here