Fix minor syntax issues, remove unused views