Sass Cleanup

Continued to clean up old code with new sass format