Updated main to remove unused elements.