cleanup of unnecessary stuff