removed useless classes and re-introduced quartz