Cleaned up unused code in files