Removed hard references to home directory