[#014] More cleaning up
[#014] Removing unused code