Removed last two mains
 - Fixes #5