Cleaned up unused lines