Removing unused/undeveloped modules
Fixed deploy test