Cleaned up in NetFabb