Clean up code
Merge branch 'stable/icehouse' of https://github.com/jon-wei/neutron into stable/icehouse