Removed sections of code that might not be needed.