Code cleanup

Code cleaned up and BootBox removed.