fix warnings
remove unused code
correction to HAML template for enquiry views ~ incorrect nesting