Build updates + code cleanup