quick cleanup of unused methods / vars