Removing Java/Tomcat custom aliases.
Updating calibre installation method.
Adding clean-boot script.