Cleaned up unused code