Optimize over a range of possible networks
Finish removing library from Makefile
Fix constants and prepare for new optimization