cleaning up old syntax