Revert "Merge branch 'cleanup' of github.com:bifek/MinigalNano into cleanup"

This reverts commit e7a1ad3d60092c6f8d16db7e91bfb1eed4392edb, reversing
changes made to 751a1d7b6ac64c43968bae96e074005655a03fb6.