Remove dependency on Compass