Cleaned up old lines