minor clean up and dummy stuff