Remove attempt at modularising user