Cleaned up old code. #31