Making SystemAPI simpler - removing some functions