cleaned up system specific references