Remove commented code, Move dimensions to their own field.