Cleaning up application, dynamic fields