Minor improvements and cleanup

Remove some commands, comment package usage, other minor improvements.