Cleaned up dynamic forms and added handling for deleting previous step