Jarv/cleanup lms and examples