clean up unused code
parse Dimension returns empty list if there is no match
rename all the things