fixed small minification issue, cleaned up old code