Minor cleanup and code deletion